From c2aa7d074960e455a37912bf6083132d6afe08dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Mon, 11 Apr 2016 07:07:14 +0000 Subject: [PATCH] GDK W32: Deduplicate reparenting gdk_window_reparent() already changes children list for old and new parent. Doing so twice results in a circular reference in the list, which can hang the application later, for example in gtk_window_show(). https://bugzilla.gnome.org/show_bug.cgi?id=764845 --- gdk/win32/gdkwindow-win32.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 3029e46ee3..c304912a4b 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -1662,8 +1662,6 @@ gdk_win32_window_reparent (GdkWindow *window, gint y) { GdkScreen *screen; - GdkWindow *parent; - GdkWindow *old_parent; GdkWindowImplWin32 *impl; gboolean new_parent_is_root; gboolean was_toplevel; @@ -1679,8 +1677,6 @@ gdk_win32_window_reparent (GdkWindow *window, else new_parent_is_root = (gdk_screen_get_root_window (screen) == new_parent); - old_parent = window->parent; - parent = new_parent; impl = GDK_WINDOW_IMPL_WIN32 (window->impl); GDK_NOTE (MISC, g_print ("gdk_win32_window_reparent: %p: %p\n", @@ -1745,11 +1741,6 @@ gdk_win32_window_reparent (GdkWindow *window, } } - if (old_parent) - old_parent->children = g_list_remove_link (old_parent->children, &window->children_list_node); - - parent->children = g_list_concat (&window->children_list_node, parent->children); - return FALSE; } -- 2.30.2